*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5af184402cea33d08b824f50a0aada636c9225a4..fc0ae4845ba3431d91bffdde1bff16ac6d0d1865 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -62,7 +62,6 @@
        * menu-bar.el (clipboard-yank): Bomb out in interactive use if
        buffer is read-only.
 
->>>>>>> 1.10102
 2006-09-18  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * allout.el (allout-unprotected): Let inhibit-read-only only when